From 9d55608cd62de7b94f50cc337f0d9bf8e387351d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 8 Mar 2004 00:55:21 +0000 Subject: [PATCH] Correct localtime_r() emulation on Win32. Remove a couple of unnecessary 2004-03-08 Tor Lillqvist * tests/testfilechooser.c: Correct localtime_r() emulation on Win32. Remove a couple of unnecessary Win32-only includes. --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-4 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ tests/testfilechooser.c | 5 +---- 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index abe8536f46..58a311adf4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,9 @@ * gtk/gtk.def: Small update. Thanks to J. Ali Harlow. Re-sorted. + * tests/testfilechooser.c: Correct localtime_r() emulation on + Win32. Remove a couple of unnecessary Win32-only includes. + Mon Mar 8 01:06:17 2004 Matthias Clasen * tests/testentrycompletion.c: Test dynamic addition/removal. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index abe8536f46..58a311adf4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -8,6 +8,9 @@ * gtk/gtk.def: Small update. Thanks to J. Ali Harlow. Re-sorted. + * tests/testfilechooser.c: Correct localtime_r() emulation on + Win32. Remove a couple of unnecessary Win32-only includes. + Mon Mar 8 01:06:17 2004 Matthias Clasen * tests/testentrycompletion.c: Test dynamic addition/removal. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index abe8536f46..58a311adf4 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -8,6 +8,9 @@ * gtk/gtk.def: Small update. Thanks to J. Ali Harlow. Re-sorted. + * tests/testfilechooser.c: Correct localtime_r() emulation on + Win32. Remove a couple of unnecessary Win32-only includes. + Mon Mar 8 01:06:17 2004 Matthias Clasen * tests/testentrycompletion.c: Test dynamic addition/removal. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index abe8536f46..58a311adf4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -8,6 +8,9 @@ * gtk/gtk.def: Small update. Thanks to J. Ali Harlow. Re-sorted. + * tests/testfilechooser.c: Correct localtime_r() emulation on + Win32. Remove a couple of unnecessary Win32-only includes. + Mon Mar 8 01:06:17 2004 Matthias Clasen * tests/testentrycompletion.c: Test dynamic addition/removal. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index abe8536f46..58a311adf4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -8,6 +8,9 @@ * gtk/gtk.def: Small update. Thanks to J. Ali Harlow. Re-sorted. + * tests/testfilechooser.c: Correct localtime_r() emulation on + Win32. Remove a couple of unnecessary Win32-only includes. + Mon Mar 8 01:06:17 2004 Matthias Clasen * tests/testentrycompletion.c: Test dynamic addition/removal. diff --git a/tests/testfilechooser.c b/tests/testfilechooser.c index 24cd1604bf..6c76f70bcc 100644 --- a/tests/testfilechooser.c +++ b/tests/testfilechooser.c @@ -11,14 +11,11 @@ #include #ifdef G_OS_WIN32 -# define WIN32_MEAN_AND_LEAN -# include /* ExtractAssociatedIcon */ # include -# define localtime_r(t,b) localtime(t) +# define localtime_r(t,b) *(b) = *localtime (t) # ifndef S_ISREG # define S_ISREG(m) ((m) & _S_IFREG) # endif -# include /* gdk_win32_hdc_get */ #endif #include "prop-editor.h" -- 2.30.2